Simplify TransportAddress #20798
Merged
Simplify TransportAddress #20798
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
since TransportAddress is now final we can simplify it's interface a bit and remove methods that are only used in tests or are plain delegates.
s1monw
added
review
:Distributed/Network
jasontedor
approved these changes
Oct 7, 2016
| @@ -144,8 +145,10 @@ static void log(final Logger logger, final String error) { | |||
| */ | |||
| // visible for testing | |||
| static boolean enforceLimits(BoundTransportAddress boundTransportAddress) { | |||
| return !(Arrays.stream(boundTransportAddress.boundAddresses()).allMatch(TransportAddress::isLoopbackOrLinkLocalAddress) && | |||
| boundTransportAddress.publishAddress().isLoopbackOrLinkLocalAddress()); | |||
| Predicate<TransportAddress> isLoopbackOrLinkLocalAddress = (t) -> t.address().getAddress().isLinkLocalAddress() | |||
There was a problem hiding this comment.
The parentheses around t are unnecessary.
jasontedor
reviewed
Oct 7, 2016
| "open sesame", emptyMap()); | ||
| ReindexRequestBuilder request = ReindexAction.INSTANCE.newRequestBuilder(client()).source("source").destination("dest") | ||
| .setRemoteInfo(remote); | ||
| assertThat(request.get(), matcher().created(1)); | ||
| } | ||
|
|
||
| public void testReindexSendsHeaders() throws Exception { | ||
| RemoteInfo remote = new RemoteInfo("http", address.getHost(), address.getPort(), new BytesArray("{\"match_all\":{}}"), null, null, | ||
| RemoteInfo remote = new RemoteInfo("http", address.getAddress(), address.getPort(), new BytesArray("{\"match_all\":{}}"), null, null, |
There was a problem hiding this comment.
Checkstyle is unhappy with this.
jasontedor
reviewed
Oct 7, 2016
| @@ -107,7 +107,7 @@ public void testReindexSendsHeaders() throws Exception { | |||
| } | |||
|
|
|||
| public void testReindexWithoutAuthenticationWhenRequired() throws Exception { | |||
| RemoteInfo remote = new RemoteInfo("http", address.getHost(), address.getPort(), new BytesArray("{\"match_all\":{}}"), null, null, | |||
| RemoteInfo remote = new RemoteInfo("http", address.getAddress(), address.getPort(), new BytesArray("{\"match_all\":{}}"), null, null, | |||
There was a problem hiding this comment.
Checkstyle is unhappy with this.
jasontedor
reviewed
Oct 7, 2016
| @@ -125,7 +125,7 @@ public void testReindex() throws Exception { | |||
| public void testReindexFromRemote() throws Exception { | |||
| NodeInfo nodeInfo = client().admin().cluster().prepareNodesInfo().get().getNodes().get(0); | |||
| TransportAddress address = nodeInfo.getHttp().getAddress().publishAddress(); | |||
| RemoteInfo remote = new RemoteInfo("http", address.getHost(), address.getPort(), new BytesArray("{\"match_all\":{}}"), null, null, | |||
| RemoteInfo remote = new RemoteInfo("http", address.getAddress(), address.getPort(), new BytesArray("{\"match_all\":{}}"), null, null, | |||
There was a problem hiding this comment.
Checkstyle is unhappy with this.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
since TransportAddress is now final we can simplify it's interface a bit
and remove methods that are only used in tests or are plain delegates.